Auto merge of #2154 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 Nov 2015 18:58:52 +0000 (18:58 +0000)
committerbors <bors@rust-lang.org>
Thu, 19 Nov 2015 18:58:52 +0000 (18:58 +0000)
commit89fcd5d05ea18732f81f885a639973f39620d1db
treec30fab3bed0f0799749b8c98aa14dc379a14c12f
parent9b69994a23a643b61bddae84bb6bfce5db5d7338
parente0dff0f2dd6fceff892b8911aff32e3bec4e6a10
Auto merge of #2154 - alexcrichton:update, r=alexcrichton

Closes #2152